From ad6a316ee5b79fe0a0c8c033fedfd228a5a915fc Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 6 Feb 2001 03:08:34 +0000 Subject: [PATCH] Fix syntax error introduced with earlier commit) (pointed out by Ollie Mon Feb 5 22:05:57 2001 Owen Taylor * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax error introduced with earlier commit) (pointed out by Ollie Lho) --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-0 | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ ChangeLog.pre-2-2 | 11 +++++++++++ ChangeLog.pre-2-4 | 11 +++++++++++ ChangeLog.pre-2-6 | 11 +++++++++++ ChangeLog.pre-2-8 | 11 +++++++++++ gdk/linux-fb/gdkimage-fb.c | 1 - gtk/gtkbutton.c | 6 +----- 9 files changed, 78 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b7bc3b33d..b69f157613 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Mon Feb 5 22:05:57 2001 Owen Taylor + + * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax + error introduced with earlier commit) (pointed out by + Ollie Lho) + +Mon Feb 5 12:25:06 2001 Owen Taylor + + * gtk/gtkbutton.c: Remove calls to gtk_grab_add/gtk_grab_remove, + which are no longer necessary. + Mon Feb 5 13:22:54 GMT 2001 Tony Gale * docs/faq/gtk-faq.sgml: s/MISK/MISC/ diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9b7bc3b33d..b69f157613 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +Mon Feb 5 22:05:57 2001 Owen Taylor + + * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax + error introduced with earlier commit) (pointed out by + Ollie Lho) + +Mon Feb 5 12:25:06 2001 Owen Taylor + + * gtk/gtkbutton.c: Remove calls to gtk_grab_add/gtk_grab_remove, + which are no longer necessary. + Mon Feb 5 13:22:54 GMT 2001 Tony Gale * docs/faq/gtk-faq.sgml: s/MISK/MISC/ diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9b7bc3b33d..b69f157613 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +Mon Feb 5 22:05:57 2001 Owen Taylor + + * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax + error introduced with earlier commit) (pointed out by + Ollie Lho) + +Mon Feb 5 12:25:06 2001 Owen Taylor + + * gtk/gtkbutton.c: Remove calls to gtk_grab_add/gtk_grab_remove, + which are no longer necessary. + Mon Feb 5 13:22:54 GMT 2001 Tony Gale * docs/faq/gtk-faq.sgml: s/MISK/MISC/ diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9b7bc3b33d..b69f157613 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +Mon Feb 5 22:05:57 2001 Owen Taylor + + * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax + error introduced with earlier commit) (pointed out by + Ollie Lho) + +Mon Feb 5 12:25:06 2001 Owen Taylor + + * gtk/gtkbutton.c: Remove calls to gtk_grab_add/gtk_grab_remove, + which are no longer necessary. + Mon Feb 5 13:22:54 GMT 2001 Tony Gale * docs/faq/gtk-faq.sgml: s/MISK/MISC/ diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9b7bc3b33d..b69f157613 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +Mon Feb 5 22:05:57 2001 Owen Taylor + + * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax + error introduced with earlier commit) (pointed out by + Ollie Lho) + +Mon Feb 5 12:25:06 2001 Owen Taylor + + * gtk/gtkbutton.c: Remove calls to gtk_grab_add/gtk_grab_remove, + which are no longer necessary. + Mon Feb 5 13:22:54 GMT 2001 Tony Gale * docs/faq/gtk-faq.sgml: s/MISK/MISC/ diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9b7bc3b33d..b69f157613 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +Mon Feb 5 22:05:57 2001 Owen Taylor + + * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax + error introduced with earlier commit) (pointed out by + Ollie Lho) + +Mon Feb 5 12:25:06 2001 Owen Taylor + + * gtk/gtkbutton.c: Remove calls to gtk_grab_add/gtk_grab_remove, + which are no longer necessary. + Mon Feb 5 13:22:54 GMT 2001 Tony Gale * docs/faq/gtk-faq.sgml: s/MISK/MISC/ diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9b7bc3b33d..b69f157613 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +Mon Feb 5 22:05:57 2001 Owen Taylor + + * gdk/linux-fb/gdkimage-fb.c (_gdk_fb_get_image): Fix syntax + error introduced with earlier commit) (pointed out by + Ollie Lho) + +Mon Feb 5 12:25:06 2001 Owen Taylor + + * gtk/gtkbutton.c: Remove calls to gtk_grab_add/gtk_grab_remove, + which are no longer necessary. + Mon Feb 5 13:22:54 GMT 2001 Tony Gale * docs/faq/gtk-faq.sgml: s/MISK/MISC/ diff --git a/gdk/linux-fb/gdkimage-fb.c b/gdk/linux-fb/gdkimage-fb.c index 81251ff2e0..26aded2a24 100644 --- a/gdk/linux-fb/gdkimage-fb.c +++ b/gdk/linux-fb/gdkimage-fb.c @@ -166,7 +166,6 @@ _gdk_fb_get_image (GdkDrawable *drawable, { GdkImage *image; GdkImagePrivateFB *private; - gint bits_per_pixel = GdkPixmapFBData fbd; g_return_val_if_fail (drawable != NULL, NULL); diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index a664032692..f1cf1f4ab9 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -746,10 +746,7 @@ gtk_button_button_press (GtkWidget *widget, gtk_widget_grab_focus (widget); if (event->button == 1) - { - gtk_grab_add (GTK_WIDGET (button)); - gtk_button_pressed (button); - } + gtk_button_pressed (button); } return TRUE; @@ -768,7 +765,6 @@ gtk_button_button_release (GtkWidget *widget, if (event->button == 1) { button = GTK_BUTTON (widget); - gtk_grab_remove (GTK_WIDGET (button)); gtk_button_released (button); } -- 2.30.2